Cleaned up comments and files