js cleaned up, sass cleaned as well
further code clean up