Cleaning up the asserts and refactoring the line lengths