Code cleanup



<!---
@huboard:{"order":287.875}
-->