improve code's style modications