Formatted code a bit