working
Organize code