refactor according to ornicar suggestions
refactor according to ornicar suggestions

luanlv/lila,arex1337/lila,arex1337/lila,luanlv/lila,arex1337/lila,arex1337/lila,luanlv/lila,luanlv/lila,arex1337/lila,luanlv/lila,luanlv/lila,arex1337/lila,luanlv/lila,arex1337/lila