Some code style changes; added TODO list