Refactored boolean to Boolean