source code cleanup - closes #6