Cleaning out some comments + name tweaks