Formatting, lil bit of error handling