Clean up code warnings, need more consistent logger