further cleanup, moving methods to relevant part of the class