More steps towards cleaner and more reliable code.