Added cleaned up JS