Code consistency/style/clean-up