Code style cleanup for consistency