those pesky bugs
code cleaning