Boyscout rule, formatted, removed dead code and added comments