ref: cleaner code
ref: cleaner, simpler code