Cleaning up functions, simplifying workflow
Cleaning up functions, simplifying workflow