cleanup & consistency - close #15, closes #16