version 0.6.1 code cleanup