Cleanup logging

Was really inconsistent with logging here. Shame!