Clarify statements, remove unnecessary lines

Addresses comments in #210