Just some minor cleanup