Fixed methods and variables names.

Minor changes in comments and code formatting.