added some TODO to give feedback
some small changes to improve readability
formatted source lines at some places