Minor code readability cleanup and console logging polish.