Clean code according to Paul's suggestion