Cleaned up logging methods