I think I have got some refactoring on the table
More refactoring. It's better than cowbell