Cleaned up from various inlining