Cleanup and Refactor

Cleanup and refactor to align with the rest of our cookbook standards.