Cleanup. Added Main
Test scope