cleaned up the views file for merge