More code beautification