start clean up and refactor susu controller