Adding method comments and minor formating refactorings