Removing unnecessary return statement.
Rearranging key creation and user creation.