Little refactor/optimisations