some identifier optimization
some cleanup