Properly formatted & more conditional