Just made some refactoring