More cleanup and unform styling