clean up views and generating helper