Switched to long licence Cleanup of tab characters where necessary Cleanup of unused imports where necessary