[TASK] Remove some whitespace and commented code