Big cleanup

Moved some methods around, where they belong :+1: