Cleanup
Empty lines
Simpler tests