Added options to get function. A bit of code tidying.