More code cleanup and formatting!