moved $q decorator to end of file for readability's sake