closes #3
Also cleaned up.