Refactor code

Removed test comment