Cleanup Space and Comment