finishing the day
some refactoring