Fixed Some Style Issues