Fixed spacing
cleanup