Removing sloppy code