Clean up comments

Cleaned up file structure, including imports and comments