Simplified a few lines