Remove blank line
Tiny code refactoring
Update test code for refactoring