Ransack working but would like to tidy it up