Fix formatting and remove if self check that wasn't needed.