Fixed mess in code