Refactor Question method

Now a C! Take that CodeClimate!