Classes were tagged, field initialization refactored, unnecessary code removed