Remove more unused imports
Tidy up and document some more bits with required params
Lower character count and improve readability