Refactoring Creeper 1st part