removed print statement
removed not needed workaround code
refactoring