:lipstick: Reorder methods
:lipstick: scrutinizer stuff
:white_check_mark: Add more tests