v0.4

- code cleanup