Some more stuff and formatting