Cleanup (make coding style consistent)