Reworked Autogen Methods

Made autogen code less verbose.