Some small refactoring and getting in touch with the code again