CYB-364 - Code cleanup - front-end

https://jira.ets.berkeley.edu/jira/browse/CYB-364
Merge pull request #218 from christianv/CYB-364

CYB-364 - Code cleanup - front-end