Fix formatting issues
Some cleaning up