remove double log message; tweak code readability