Tweaked a few things - general cleanup