Tidyup logging to all use 'Level.X'