Slimify remaining code