Code cleanup (wrapped lines to 80 chars, made OI a little bit clearer