Remove unnecessary code, add consistency