Some code beautifications