Streamlined User class a bit more