clean up view and if/then logic short hand