Refactoring - Partial clean up of names
Removed necessary import for now - willbe necessary when stricter Q**
rules are added later