remove some unessential code + tab indent cleanup

remove some unessential code + tab indent cleanup