removed some redundencies and scaffolding
bump