Keep refactoring

Mainly naming stuff this time