Fixed formatting oddities
Fixed further formatting and cleanup