Fixed up naming and added highlight js