Cleaned up formatting of code