Core pr 5

Fixed some user redirects and coding style.
So what do we do about this?