cleanup and consistency - closes #8 closes #9