Miscellaneous code cleanup, bumping version to 1.0.0.beta.2