0.1.2 and code cleanup