removed some unnecessary padding