Improved Instance nameing
Code Cleanup
Removing Component selector function