0.1.2 code cleanup