Edit some methods
More refactoring