Eliminated mock and improved style