Handling formatting of booleans better. Refactored the integer formatting