Improve code little bit