reorganize order of functions
untabify everything & delete trailing whitespace