refactors for clarity

closes #1