Cleaned up code per evaluation