Minor refactor
Release 0.5.4