some smaller code cleanings/code reformattings