cleaning code, other stuffs etc