Cleaned up a few files to follow better standards