Cosmetical Changes made

left to do:
code cleaning / commenting