Clean up silly if statements. Add class comment and refine README