Cleaned the file up a bit