refactored more stuff