Re-factored the following:
 1. jsDocs
 2. business logic
Re-factored the following:
 1. jsDocs
 2. business logic