v0.4 Code cleanup and some structural changes