style/spaces cleanup