Adjusted for coding style consistency