Standardise coding style; Air.php methods return instead of output; clarity improvements; config improvements