improve code!!!