Linting fix: Make return values consistent and more straitforward

Cleaned up some functions that had inconsistent return statements.