just reformat code and move methods around