some code beautifications