some cleanup
transformation stuff