fixed inconsistencies and coding style violations