Cleanup code and spacing