Some refactoring
Some stuff that still wasn't committed