Cleanup Style Issues