For now this PR have been just cleaning, and I didn't pay attention if some logic could be simplified/made better. But thanks for your comment, it's appreciated, don't hestitatee to give me more :).