Cleanup and style fixes