Refactoring

Comments and methodextraction