Update to work with personal standards. fix small warnings and errors
Code Inspection