Cleaned up assignment 2 as Cooper suggested