Added some logging utility methods and moved some stuff around.