Updated grid unit var names
Comment an dalignment errors
Made prettier