Comments cleanup & minor fix