Performed some minor changes