Not fond of the indentation here, suggestions?