diff --git a/event_adder_impl.h b/event_adder_impl.h
index 51266ff..0c429ad 100644
--- a/event_adder_impl.h
+++ b/event_adder_impl.h
@@ -4,29 +4,33 @@
 #include "event_adder.h"
 #include "pool.h"
 
+#include <cstdint>
+
 namespace fortuna {
 namespace accumulator {
 
 class EventAdderImpl final : public EventAdder {
-private:
+public:
 	static constexpr const uint8_t p_size{32};
-	uint8_t pool;
-	static unsigned int source_id;
-	static accumulator::Pool pools[p_size];
+
+private:
+	uint8_t pool_id;
+	static unsigned int _source_id;
+	static accumulator::Pool _pools[p_size];
 
 public:
 	EventAdderImpl(const unsigned int source_id,
-				   const accumulator::Pool pools[32]) {
-		this->source_id = source_id;
-		for (unsigned int i = 0; i < this->p_size; i++) {
-			this->pools[i] = pools[i];
+				   const accumulator::Pool pools[p_size]) {
+		this->_source_id = source_id;
+		for (uint8_t i{0}; i < this->p_size; i++) {
+			this->_pools[i] = pools[i];
 		}
-		this->pool = 0;
+		this->pool_id = 0;
 	}
 
 	void add(std::vector<char> event) override {
-		this->pool = (this->pool + 1) % p_size;
-		pools[this->pool].add_entropy(source_id, event);
+		this->pool_id = static_cast<uint8_t>((this->pool_id + 1) % p_size);
+		_pools[this->pool_id].add_entropy(_source_id, event);
 	}
 };