Formatting
Better exception handling