Dry up code with helpers, improve some formatting