Removed debug print + minor change