Organized less and updated style