:+1: to the refactoring.

@TiuTalk good PR