Refactoring: 2 lines between ev-er-y function. Clean up as well.