Cleaned up code to be compliant with code standards and corrected file permission issues