Even more clean up code in listings controller