Cleaned up some js