Cleaning parameter getting so we can use it elsewhere