Refactor Activity.hpp file