cleaned up common.hpp