Cleaning more code