Cleaned up file

Cleaned up the files and made some minor modifications