Cleannig up, adding options