Be cooler and fix comments