Some Cleanup

Made some stuff a little more elegant