spaces, code clean up