code cleanup and tagging as version 0.03