some code beautifyings