* slightly improve code