Slight refactor.
Bump to 0.4.1