A little bit of refactoring done!