Adding meningfull method comments and minor formating refactorings