Committed some code beautification patches by Tron