Cleanup and efficiency

Cleaned up single lined conditionals brackets, collapsed buffering into single print statement