Fix & improve code for all four classes