Code cleanup/adhering to coding standards