Cleanup code and don't trim line