more mvc
clean up