- cleaned-up source code to remove warnings and format properly some classes