Consolidate helper functions
Remove lie