Cleaned up comments and separated files