Refactoring/cleanup already done