Cleanup of code.
Move soil options to a separate listener.