Refactored more methods

Need to do open next