code cleanup heheh
9 files changed