removed unnecessary code, style tuning