More clean up code in listings controller