a bit of refactoring was done