Code cleanup

:trollface: