started cleaning the code, but didnt change much ... next thing to do: cleaning