Reflected some minor changes