Little bit of refactoring here and there..