cleaned a little bit code and names