Spacing stuff + remove a comment + add a super to

the finish() method to ensure we leave every time without problem(s).