CYB-364 - Code cleanup - front-end

https://jira.ets.berkeley.edu/jira/browse/CYB-364