Prettier names, removed dead code