Restructure a bit more
More formatting