Code refactor
Release 0.5.3