removed dead code, added remarks, ordering around