indentation of the code and organization of some methods