cleanup and upped version to 0.4