refactored generate...Format methods
updated model class generation, added docs