Adjusted & improved code in various classes