remove if to set classname. Use classSet instead
use only completed
Merge pull request #1 from amplifiedapp/minor_updates

Minor updates