bachel0r, code cleanup