Fixed some refactoring