Some refactorization.
Forgot Ctrl+S.