cleanup implementation a bit using new macros.
cleanup implementation a bit using new macros.

Endika/metabase,lukaswelte/metabase,jonasdiel/metabase-ptBR,blueoceanideas/metabase,lukaswelte/metabase,Endika/metabase,jonasdiel/metabase-ptBR,lukaswelte/metabase,Endika/metabase,Endika/metabase,lukaswelte/metabase,zoowii/metabase,jonasdiel/metabase-ptBR,zoowii/metabase,blueoceanideas/metabase,lukaswelte/metabase,dashkb/metabase,blueoceanideas/metabase,zoowii/metabase,jonasdiel/metabase-ptBR,blueoceanideas/metabase,dashkb/metabase,zoowii/metabase,blueoceanideas/metabase,Endika/metabase,zoowii/metabase,dashkb/metabase,jonasdiel/metabase-ptBR,dashkb/metabase,dashkb/metabase