Make the code more general purpose (i.e. remove Australis stuff) and cleanup style