More refactoring for two hours Next project I should write things well the first time πŸ™ƒ