Code cleanup + getting ready to release v0.0304