Makes everything work
cleans up some white space