Improve Evaluation formatting

Change: improve formatting with more whitespace and refactored code
placement.