Comments cleanup