Some refactoring

:+1: