Moved some types around Removed unnecessary params Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com> Co-authored-by: Alois Klink <alois@aloisklink.com>