get function 30 working plus additional cleanup