Cleaned code, removed singletons
Merge pull request #5 from cmastudios/feature/clean

Cleaned code, removed singletons