Some code beautified :)