Fix long lines
Cleanup code