Fixing some things so hopefully my style is in check