js cleaned up, sass cleaned as well
further code clean up
Merge branch 'ja-code-prep' into develop