Some code beautifying.