Some code beautification.