Minor formatting updates
Removed more unnecessary strings