Cleanup check if / then logic