Some niceification

code editing