code cleaning :P