Cleaned up the files

Cleaned up the files and made some formatting and minor modifications.