[final] - removed debug print lines, cleanup code