Multiple refactors and bug fixes inside classes