Det forced me to clean up my code...

No functional changes though...