Cleanup code, You are very fast ) Accept small fixes