removed some unused lines, fixed some padding