* Eliminate boolean arguments in favor of using enums