Splitting QOTFs to a separate file
Small cleanup
More cleanup! :)