Tweaked

After receiving some feedback I've tweaked a few methods.