Fix logging and remove a tiny bit of redundancy