Fixed up some tab/space issues
More formatting updates
updated for formatting