Cleaned up inline