little changes; remove rlp
PEP8'ing
more pep8'ing