Tidied. Replaced unless by if.