Performed some minor cleanup