Refactored out all applicable JS