Formatted, cleaned up code and organized imports using new standards in an effort to increase overall quality of the code