removing if{} block used for testing