MX224: Some code style + cleanups.