fixed formatting and stuff
fixed formatting and stuff