fixed unnecessary logging issue and cleaned up views