Some indentation and order updates
Fixed printing.
Cleaned up.