Cleanup/Organize code