Cleaning up code smells. Debugging.