Cleaned up javascript / html