cleaned up method/variable declarations and comments