more refactorings before initiating the testing phase