0.014: logging, some code clean-up
0.014: logging, some code clean-up