Code cleanup

:smiley: