clean code according to Paul's comment