Fix formatting and make more consistent code