More changes

Made stuff more beautiful