First Commit

Cleanup & Refactor