Cleanup
cleanup
refactor, cleanup code