Some style changes, why yes I should be doing actual work instead